From 9f606b827092e2edd887686507cd6e4bb368bb07 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 26 Feb 2016 13:15:37 +0100 Subject: [PATCH] Adwaita: stricter selector for split headerbar separator with a descendant select was erroneusly catching normal headerbar separators in paned split headerabar case, see gedit. Using a child selector fixes. --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 294267287b..162508cfd4 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1365,7 +1365,7 @@ headerbar { box-shadow: none; } - separator { background-color: $borders_color; } + > separator { background-color: $borders_color; } @extend %titlebar; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 62094f69d5..8df37ad186 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1766,7 +1766,7 @@ window.csd > .titlebar:not(headerbar) { border-style: none; border-color: transparent; box-shadow: none; } -.titlebar:not(headerbar) separator { +.titlebar:not(headerbar) > separator { background-color: #1c1f1f; } /************ diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 4544b3a515..887248c356 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1770,7 +1770,7 @@ window.csd > .titlebar:not(headerbar) { border-style: none; border-color: transparent; box-shadow: none; } -.titlebar:not(headerbar) separator { +.titlebar:not(headerbar) > separator { background-color: #9d9d99; } /************ -- 2.30.2